Making folder items match those on workspace

-> Deleted some unused files

Change-Id: I2e657d7a82140e55ecc674ee759c0c7bcf11ebe1
8 files changed