Code Structure

Structure the code added the first few classed.