Updated the readme and improved source code navigability.