Adding files from the original project with minimal changes