some more cleaning in the structure, files and code