Use a better module/directory structure for the source code