Reorginization of code. Some files divided in subdirectories.