Re-done initial structure

This should be a more suitable start to the project than what I had originally made.