cleaned up file
updated file structure, and other major updates