Moved modules into their own package + Pong