Moved files around to separate app stuff
Updated code to match new structure