Splits methods into separate classes;
Adds simple Javadocs
Makes methods public