Refactored to have modules, collections and views on their own files