refactor, delete unused files, dropped autolayout, test on diff devices