cleaned the file structure a bit