Break modules into separate files
Fix some require paths