Remove unnecessary imports
Keep only relevant files and flatten directory structure