Started modularizing packages (BROKEN)