Collection

Some renaming, and raco pkg install now works properly with this project