Design Updated and File Structure Setup