Properly organized .h and .m files