Reorganized files, finished better power reallocation code