Added singleton files to core project