Changed file structure and removed unnecessary files