Re-organized build file a bit.