Making a tab-completion friendly folder structure

As you can see in the listing, we have also moved old code names to the
new structure.