Refactored files structure, toolbar, editor