Better organization and added files still //TODO.