first time in
make it compiling with new subdirs structure and some cleaning