Re-Org

Re-Org of File Structure to support additional users