Common components were moved to subfolder