Updated folder structure
renamed files and updated references