Slight refactoring
Move modules directory under oopa/
Finish move