remove unused files move declarations to .m files