v0.0.5

General renaming, ordering...