Update project structure (from develop)

The project tree now doesn't look messy, I guess.