-- Optimized code structure
-- Added missing files caused through error in restructure process