Cleaned up a bit the project structure