Reorganized the structure; added new profile goodies