Major interface file organizations + Small interface tweaks for functionality.