move dependencies into parameters on sif
major style re-structuring, removed some dependencies