Move away from module system as its almost obsolete as of now