Removed a significant ammount of bloat code. De-duplification is very near complete.
Updated with new files and file locations