Moved code into module structure