Fixing imports and removing unused files