Directory Structure

Finishing off the organization of the directory structure, and making sure the right build images are being displayed.