Move everything to the right folder after directory structure reorganization
improvements and tests