removing files and restructuring directory