Changed how variables are arranged in hpp files