Fixed class-module pathes
Resolved requires by adding them inside the appropriate files