More refactoring, fixed Position and Direction namespace