Fixing external lib sources to internal project structure