moving some files around for proper structure