Refactoring and renaming of some of the folders.
Added arrays and equality.