The big swift.pro is refactored by the correct usage of SUBDIRS template. The following additional changes are made: - Removed '_' from all targets and folder names - Aligned parent folder and target name refs #461