Minor rearranging & cleanup part B (forgot to commit some files)