Renamed main file, added more javadoc