Source files are now in separate directories