Added TODO message to convert switch lookup to a static table lookup.
restructure project