Syncing with actual usage

 - Removing files I do not need
 - Updating to match files in use