moved modules to modules directory, fixed paths issue