removed unused files and fixed structure of folders etc