Refactoring. Added src dir