moved some files arround, includes comments from previous commit