Organized code into appropriate modules