Further restructured project
Moved code around a little bit