Revert "Major changes in all classes, additions of DAO classes"

This reverts commit c223d6d82db9cddc37c4e5dee2cec8c6c3f6918d.
Major changes in all classes, additions of DAO classes