Move some files around and clean up a bit the mess