Re-organized files - current version