Some cleaning up & imported files paths updates