Reorginized file structure