Restructured project
Forgot to commit header
Merge branch 'structure'