Move source code into new module