Re-arrange file/folder structure

Move out of package format into a flat-folder structure to simplify.