Cleanup

Moving things around