v0.0.0505a

File structure reorg