Added structure and layout - linked up files