Removed unnecessary source
Simplified validators
Added project tests
Added more unit tests