Major updates to package structure. Almost to revision 0.1!