Modularizing

Trying to get something consistent across platforms.