Changed file structure

Changed (and simplified) the file structure.