Reorginized File Structure