Refactored project directory and added SonaType dependency