Removed the unused files. System is now clean. Sooon, will be moving back to all files in a single folder.