Moved some Methods from Module into the .cpp file and fixed resulting dependency errors