Re-arranged file structure