Moved singleton files into project folder