Add source
Fix structure & namespace
Merge categories, add Form
Fix namespace, remove category repository