Updated Code

Updated the File Structure and Code.