Remove unised files and projects

Correct module dependencies