Version 0.2.1 : File structure now complete, with no namespace collisions