Reverted back to flat directory in this branch until multi-level is
working