Added inheritance modules and little changes in project structure