fixed files after trying to streamline them.
restructured with two controllers