v 0.0.6, actual file structure, includes changes