Changed file structure & file names