Updated working source to use correct folder structure.