Major Update - Rearranged files, modified code, added new content