Reorganization

Because there was module import error with CategoryColl and I decided to
reorganize other files too