(BROKEN) Much better app structure, but removed all node modules to start fresh - another commit soon