Properly organized the modules so we can require properly