Directory Structure Changes

Moves directory structure closer to larval 4.3