Fixed project structure, fixed file header