Additional Work on File Structure and Setup