Fixed file hierarchy
Fixed compile errors
Merge branch 'master' into rendering-system