WIP refactoring 2
Added files