refactored
moved to modules
context path updated