Changed structure to keep everything in one folder (for now...)