Fix the project structure
Delete untracked files