Refactored all files to look more like Photomania