pollux: reorganize and cleanup

Change-Id: I43286c5338ea8dd10c34b6dd57f75cd2692d95d1