Moved files out of pointless app folder & furthered work on tests