Refactoring
Removed public directory