Re-organizing

naming conventions