Got rid of component/core subdirectory too.