Removed files and changed folder structure