Clean up and move to some structure for app