Cleanup and make changes
Split up full conditional source files