Updated file structure and settings page