Adds Timezone support
removes unnecessary files and cleans up code