Moved categories to other files as well as updates in commits