Small improvement
Moved to new directory