Moving it all into a src dir