More code refactoring and file structure

Modified again file structor and made some refactoring.
Moved files, more refactoring

File structure was modified again, did some refactoring.