Refactor System (Kick frameworks for edit/new views) + Simplify directory architecture