Updated file structure and removed extra files