Renamed package to comply with naming conventions
Reviewed code, added/removed some TODOs