WIP: small changes
WIP: Changed package structure
WIP: Changed package structure, added javadoc
WIP: printlns