Moved everything into subdirectory.

Done this so we can start making new packages at root level