Name changing, moving stuff around, javadoc fixes... - WIP