added forms
merged nicks code
cleaned up folder structure