Added core require
Refactored old modules