Renamed some files to make it more intuitively, and some more javadoc