Moved around files. Starting to take form.