New project structure, using classes now, version 0.1.0