Moved resources into base folder