moved things around into a proper project