Removed Apache Commons dependency
Added project's resources for future use