General Changes

Added and removed some used/unused files.