Changed Structure

Updated Structure and files