remove unused files
re-structure