Reorganize packages

[niaow]

So the way these are organized is a mess. We need to use two directory levels (or more?). Also it is ambiguous what should go in main.