More content and reorganized some files