moved controllers into a sub-module; re-organized folder structure