Shitt cleaning, spliting into modules