Reorganized files. Getting app pieces together.