Reorganize modules and version bump