Index file and some classes reworked. Redundant classes removed.