directory restructure and version bump