Updated Structure

Changed file structure, code, and layout