New folder structure, main menu mostly complete