Reified: refactored base package out + added some javadoc