Removed obsolete packages and classes; fixed URLs mapping
Improved code readability