adding refactored files, before decoupling view from controller