Updated file structure and relevant config files