Added more class's declarations; unstable commit.
Fixed modules reset function
Merge branch 'master' of https://github.com/GhostVIRUS/OOPwS