Changed project layout
Reorganized project layout
Second problem
Third problem
Fourth problem
Fifth problem
Sixth problem
Seventh problem
Eigth problem
Ninth problem and cleaned up some previous code
Merge pull request #1 from NTARelix/master

Master