Still having troubles: separated into modules