Added Core dependency, removed unused files