Major re-factoring- much more readable, grouped by rough area of interest
Remove skel files