Updated the usage of FOLDER in the build system