Moved modules into a separate folder