Splitting up into seperate modules