Adjusted module structure to be more in line with conventions