Moved code to src/