Initial reorganization of the package structure, there may be missing files, I'll check them one by one later on