fixed dependency / build path issues.
Fixed import declaration that became an issue after fixing build path
(see last commit).